From 3be448811f3702a5b52a21d0a55683c018122759 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 1 Apr 2014 18:21:43 +0200 Subject: [PATCH] fix sed usage in build rules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Apparently FreeBSD sed is more picky than GNU sed, wanting a semicolon at the end of a brace enclosed statement list. Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/Rules.mk | 2 +- xen/arch/x86/boot/build32.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 42c713fa35..b0d463401a 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -170,7 +170,7 @@ SPECIAL_DATA_SECTIONS := rodata $(foreach n,1 2 4 8,rodata.str1.$(n)) \ $(foreach r,rel rel.ro,data.$(r) data.$(r).local) $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile - $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p}' | while read idx name sz rest; do \ + $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' | while read idx name sz rest; do \ case "$$name" in \ .text|.text.*|.data|.data.*|.bss) \ test $$sz != 0 || continue; \ diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index a2d4b34244..a36f62064e 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -20,7 +20,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) %.o: %.c $(CC) $(CFLAGS) -c -fpic $< -o $@ - $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p}' |\ + $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ while read idx name sz rest; do \ case "$$name" in \ .data|.data.*|.rodata|.rodata.*|.bss|.bss.*) \ -- 2.30.2